Remove stray conflicty markar that the VCS somehow ignored.
authorEric S. Raymond <esr@thyrsus.com>
Thu, 9 Jan 2014 16:49:05 +0000 (11:49 -0500)
committerEric S. Raymond <esr@thyrsus.com>
Thu, 9 Jan 2014 16:49:05 +0000 (11:49 -0500)
commit2eec925b2d1fbaee811c60b3f2f31ca2d376a4d2
tree36362da94159cd1edaca083b60874e3bc9ef1c00
parenta8ee1dad33552bd9f192672bfb526c60ed625c13
Remove stray conflicty markar that the VCS somehow ignored.
lisp/ChangeLog